Split documentation into gpsbabel-doc.

diff --git a/debian/control b/debian/control
index efc910f4a356dec4aad7ea5755c6610ae1b8a3e0..9463c6b4865dc102835819d1aa5ec25495a59554 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,10 @@ Maintainer: Bernd Zeimetz <bzed@debian.org>
 Build-Depends: debhelper (>= 7.0.0), quilt,
  autotools-dev, autoconf,
  libexpat1-dev, expat, help2man,
- fop [!mips],
- xsltproc, docbook-xml, docbook-xsl, libxml2-utils,
- libusb-dev, zlib1g-dev, libpaper-dev, libqt4-dev
+ libxml2-utils,
+ libusb-dev, zlib1g-dev, libqt4-dev
+Build-Depends-Indep: fop [!mips], xsltproc, docbook-xml,
+ docbook-xsl, libpaper-dev 
 Standards-Version: 3.8.4
 Homepage: http://www.gpsbabel.org/
 Vcs-Browser: http://git.recluse.de/debian/pkg-gpsbabel.git/
@@ -15,6 +16,7 @@ Vcs-Git: git://git.recluse.de/debian/pkg-gpsbabel.git
 
 Package: gpsbabel
 Architecture: any
+Recommends: gpsbabel-doc
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GPS file conversion plus transfer to/from GPS units
  GPSBabel converts waypoints, tracks, and routes from one format to
@@ -42,6 +44,25 @@ Description: GPS file conversion plus transfer to/from GPS units
  Tab-separated data, Tiger, TopoMapPro, Topo by National Geographic,
  xcsv, xmap, xmapwpt.
 
+Package: gpsbabel-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: gpsbabel, pdf-viewer | www-browser
+Description: GPS file conversion plus transfer to/from GPS units
+ GPSBabel converts waypoints, tracks, and routes from one format to
+ another, whether that format is a common mapping format like Delorme,
+ Streets and Trips, or even a serial upload or download to a GPS unit
+ such as those from Garmin and Magellan.
+ .
+ GPSBabel supports dozens of data formats and will be useful for tasks
+ such as geocaching, mapping, and converting from one GPS unit to another.
+ Among the interesting formats it supports are several GPS devices via
+ a serial link, various PDA-based mapping programs, and various
+ Geocaching data formats.
+ .
+ This package contains the detailed documentation of gpsbabel.
+
 Package: gpsbabel-gui
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

diff --git a/debian/gpsbabel-doc.doc-base-common b/debian/gpsbabel-doc.doc-base-common
new file mode 100644 (file)
index 0000000..9a5224a
--- /dev/null
+++ b/debian/gpsbabel-doc.doc-base-common
@@ -0,0 +1,8 @@
+Document: gpsbabel
+Title: gpsbabel filter and format documentation
+Section: Science/Geoscience
+
+Format: HTML
+Index: /usr/share/doc/gpsbabel/htmldoc/index.html
+Files: /usr/share/doc/gpsbabel/htmldoc/*.html
+

diff --git a/debian/gpsbabel-doc.doc-base-pdf b/debian/gpsbabel-doc.doc-base-pdf
new file mode 100644 (file)
index 0000000..c2544cd
--- /dev/null
+++ b/debian/gpsbabel-doc.doc-base-pdf
@@ -0,0 +1,3 @@
+Format: PDF
+Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz
+

diff --git a/debian/gpsbabel-doc.install b/debian/gpsbabel-doc.install
new file mode 100644 (file)
index 0000000..71d2e65
--- /dev/null
+++ b/debian/gpsbabel-doc.install
@@ -0,0 +1 @@
+debian/doctmp/* usr/share/doc/gpsbabel

diff --git a/debian/gpsbabel-doc.links b/debian/gpsbabel-doc.links
new file mode 100644 (file)
index 0000000..0a5be16
--- /dev/null
+++ b/debian/gpsbabel-doc.links
@@ -0,0 +1 @@
+usr/share/doc/gpsbabel usr/share/doc/gpsbabel-doc/doc

diff --git a/debian/gpsbabel.doc-base-common b/debian/gpsbabel.doc-base-common
deleted file mode 100644 (file)
index 9a5224a..0000000
--- a/debian/gpsbabel.doc-base-common
+++ /dev/null
@@ -1,8 +0,0 @@
-Document: gpsbabel
-Title: gpsbabel filter and format documentation
-Section: Science/Geoscience
-
-Format: HTML
-Index: /usr/share/doc/gpsbabel/htmldoc/index.html
-Files: /usr/share/doc/gpsbabel/htmldoc/*.html
-

diff --git a/debian/gpsbabel.doc-base-pdf b/debian/gpsbabel.doc-base-pdf
deleted file mode 100644 (file)
index c2544cd..0000000
--- a/debian/gpsbabel.doc-base-pdf
+++ /dev/null
@@ -1,3 +0,0 @@
-Format: PDF
-Files: /usr/share/doc/gpsbabel/gpsbabel.pdf.gz
-

diff --git a/debian/gpsbabel.docs b/debian/gpsbabel.docs
index e2de8ee8e72668190de5641ea008c505c0ca42a9..5734f62369c8ad9d226d608ad803b3876c0272bb 100644 (file)
--- a/debian/gpsbabel.docs
+++ b/debian/gpsbabel.docs
@@ -1,3 +1,2 @@
 README.*
-debian/doctmp/*
 AUTHORS

diff --git a/debian/rules b/debian/rules
index 8f3be076cf507fc15003024bd3fd491cb039f332..286e71a2a4a4c42cd95a26de8ee8e1c842d278f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,8 +61,10 @@ debian/gpsbabel.1: build-stamp
 gui/Makefile: $(QUILT_STAMPFN)
        cd gui && qmake-qt4
 
-BUILD_TARGETS = build-stamp build-gui-stamp build-doc-stamp debian/gpsbabel.1
-build: $(BUILD_TARGETS)
+BUILD_TARGETS_ARCH = build-stamp build-gui-stamp debian/gpsbabel.1
+BUILD_TARGETS_INDEP = build-doc-stamp
+# indep targets are only built by binary-indep.
+build: $(BUILD_TARGETS_ARCH)
 
 build-stamp: configure-stamp 
        dh_testdir
@@ -76,12 +78,12 @@ build-stamp: configure-stamp
 
 build-doc-stamp: configure-stamp
        $(MAKE) $(DOCTEMP)/htmldoc-devel/index.html WEB=$(DOCTEMP) DOCVERSION=devel
-       cp $(CURDIR)/debian/gpsbabel.doc-base-common $(CURDIR)/debian/gpsbabel.doc-base
+       cp $(CURDIR)/debian/gpsbabel-doc.doc-base-common $(CURDIR)/debian/gpsbabel-doc.doc-base
 ifneq (mips,$(HOSTARCH))
        $(MAKE) gpsbabel.pdf WEB=$(DOCTEMP) DOCVERSION=devel
        rm -f $(CURDIR)/$(DOCTEMP)/htmldoc-devel/gpsbabel-$(DOCVERSION).pdf DOCVERSION=devel
        cp gpsbabel.pdf $(CURDIR)/$(DOCTEMP)
-       cat $(CURDIR)/debian/gpsbabel.doc-base-pdf >> $(CURDIR)/debian/gpsbabel.doc-base
+       cat $(CURDIR)/debian/gpsbabel-doc.doc-base-pdf >> $(CURDIR)/debian/gpsbabel-doc.doc-base
 endif
        touch $@
 
@@ -115,45 +117,60 @@ clean-patched:
                xmldoc/filters/options/track-trk2seg.xml \
                xmldoc/filters/options/track-seg2trk.xml
        rm -f gbversion.h
-       rm -f $(CURDIR)/debian/gpsbabel.doc-base
+       rm -f $(CURDIR)/debian/gpsbabel-doc.doc-base
        dh_clean 
 
-install: $(BUILD_TARGETS)
+install-prep:
        dh_testdir
        dh_testroot
        dh_prep
-       dh_installdirs 
+       dh_installdirs
+
+install-arch: $(BUILD_TARGETS_ARCH) install-prep
 
        # Add here commands to install the package into debian/gpsbabel.
        $(MAKE) install DESTDIR=$(CURDIR)/debian/gpsbabel
 
+       dh_install -a
+
+install-indep: $(BUILD_TARGETS_INDEP) install-prep
        # Rename htmldoc dir
        mv `ls -d $(CURDIR)/debian/doctmp/htmldoc-*` $(CURDIR)/debian/doctmp/htmldoc
 
-       dh_install
+       dh_install -i
+
 
+install: install-arch install-indep
 
 # Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
+binary-indep: build-indep install-indep
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs -i
+       dh_installdocs -i
+       dh_link -i
+       dh_compress -i
+       dh_fixperms -i
+       dh_installdeb -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
 
 # Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build-arch install-arch
        dh_testdir
        dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-       dh_installman 
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_installchangelogs -a
+       dh_installdocs -a
+       dh_installman -a
+       dh_strip -a
+       dh_compress -a
+       dh_fixperms -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure 
+.PHONY: build clean binary-indep binary-arch binary install install-prep install-arch install-indep build-arch build-indep configure